From 92da9e3d840e9ba0514001e758f5e7c367f4ad6e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 3 Mar 2008 09:24:57 +0000 Subject: [PATCH] (handle_single_display_spec): Undo 2007-10-16 changes. Don't pretend as if characters with display property haven't been consumed for string-replacing-string case. --- src/xdisp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 83792108f42..f362f2c352f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4301,15 +4301,13 @@ handle_single_display_spec (it, spec, object, overlay, position, `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } else if (CONSP (value) && EQ (XCAR (value), Qspace)) { it->method = GET_FROM_STRETCH; it->object = value; - it->position = start_pos; - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = it->position = start_pos; } #ifdef HAVE_WINDOW_SYSTEM else @@ -4323,8 +4321,7 @@ handle_single_display_spec (it, spec, object, overlay, position, /* Say that we haven't consumed the characters with `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } #endif /* HAVE_WINDOW_SYSTEM */ -- 2.30.2